projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0338f79 677f376)
bitkeeper revision 1.1720 (42b7bb86ag6KD5OEx2v6YdSnS1BhGQ)
authoriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Tue, 21 Jun 2005 07:02:30 +0000 (07:02 +0000)
committeriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Tue, 21 Jun 2005 07:02:30 +0000 (07:02 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk

1  2 
BitKeeper/etc/logging_ok patch | diff1 | diff2 | blob | history
tools/libxc/xc.h patch | diff1 | diff2 | blob | history

diff --cc BitKeeper/etc/logging_ok
Simple merge
diff --cc tools/libxc/xc.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.